From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 5 May 2010 23:05:35 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6605^2~207
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=29bb36733cfab642fe7cdf1e2b052d7513efa1b8;p=emacs.git

Merge from mainline.
---

29bb36733cfab642fe7cdf1e2b052d7513efa1b8